The attached patch prevents a domain with an attached vTPM from doing

local migration since this does not seem to work correctly (see tests in
xm test suite). If no vTPM has been attached, the local migration
proceeds as usual.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>

diff --git a/tools/examples/vtpm-common.sh b/tools/examples/vtpm-common.sh
index 2e4c89dfdb24ee114a0a644c487b8507d2a26279..e5e8ddbbf5f859650090ec2af2f15e547ad60be8 100644 (file)
--- a/tools/examples/vtpm-common.sh
+++ b/tools/examples/vtpm-common.sh
@@ -48,6 +48,9 @@ else
        function vtpm_migrate() {
                echo "Error: vTPM migration accross machines not implemented."
        }
+       function vtpm_migrate_local() {
+               echo "Error: local vTPM migration not supported"
+       }
        function vtpm_migrate_recover() {
                true
        }
@@ -353,6 +356,8 @@ function vtpm_migration_step() {
        local res=$(vtpm_isLocalAddress $1)
        if [ "$res" == "0" ]; then
                vtpm_migrate $1 $2 $3
+       else
+               vtpm_migrate_local
        fi
 }
 

diff --git a/tools/examples/vtpm-impl b/tools/examples/vtpm-impl
index bd6288d636b4e84066a9ddf77c68381cde2ae79c..e45c6a170f2312e4de5aab12c4b0b1de24e2650e 100644 (file)
--- a/tools/examples/vtpm-impl
+++ b/tools/examples/vtpm-impl
@@ -184,3 +184,6 @@ function vtpm_migrate_recover() {
  echo "Error: Recovery not supported yet" 
 }
 
+function vtpm_migrate_local() {
+ echo "Error: local vTPM migration not supported"
+}